gtk: Stop using gtk_button_clicked

This function is going away.

diff --git a/gtk/a11y/gtkbuttonaccessible.c b/gtk/a11y/gtkbuttonaccessible.c
index b17db64d8389e253acc0349790827ddc5dab38bb..1a2e85e9f27297ac915ba18ff0d8a692f707925f 100644 (file)
--- a/gtk/a11y/gtkbuttonaccessible.c
+++ b/gtk/a11y/gtkbuttonaccessible.c
@@ -236,7 +236,7 @@ gtk_button_accessible_do_action (AtkAction *action,
   if (!gtk_widget_is_sensitive (widget) || !gtk_widget_get_visible (widget))
     return FALSE;
 
-  gtk_button_clicked (GTK_BUTTON (widget));
+  g_signal_emit_by_name (widget, "clicked");
   return TRUE;
 }
 

diff --git a/gtk/a11y/gtklinkbuttonaccessible.c b/gtk/a11y/gtklinkbuttonaccessible.c
index 947acc215ae14e3f3e488afe6c09505fcbf32ef8..6953cef85edd85e21877958fe62cfc7447a62b17 100644 (file)
--- a/gtk/a11y/gtklinkbuttonaccessible.c
+++ b/gtk/a11y/gtklinkbuttonaccessible.c
@@ -126,7 +126,7 @@ gtk_link_button_accessible_link_do_action (AtkAction *action,
   if (!gtk_widget_is_sensitive (widget) || !gtk_widget_get_visible (widget))
     return FALSE;
 
-  gtk_button_clicked (GTK_BUTTON (widget));
+  g_signal_emit_by_name (widget, "clicked");
 
   return TRUE;
 }

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 7f3154b9552a61ca96075041401d8dffab2daa65..7d20cb0873d13735b059702dd0178171ce92c796 100644 (file)
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -739,7 +739,7 @@ gtk_button_do_release (GtkButton *button,
        return;
 
       if (emit_clicked)
-        gtk_button_clicked (button);
+        g_signal_emit (button, button_signals[CLICKED], 0);
     }
 }
 
@@ -786,7 +786,7 @@ gtk_button_finish_activate (GtkButton *button,
   priv->button_down = FALSE;
 
   if (do_it)
-    gtk_button_clicked (button);
+    g_signal_emit (button, button_signals[CLICKED], 0);
 }
 
 /**

diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c
index e87c0d7d496686383c1bd67461a23543b76c7cdb..c4d115ff9bc597a7556deeae37598f2d90d962bf 100644 (file)
--- a/gtk/gtkradiobutton.c
+++ b/gtk/gtkradiobutton.c
@@ -760,7 +760,7 @@ gtk_radio_button_clicked (GtkButton *button)
 
          if (gtk_toggle_button_get_active (tmp_button) && (tmp_button != toggle_button))
            {
-             gtk_button_clicked (GTK_BUTTON (tmp_button));
+              g_signal_emit_by_name (tmp_button, "clicked");
              break;
            }
        }

diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c
index c482a19da01760d8f6dcedd0ae9b793e79c48700..b9984aacbf035df2a0dbfbf73086a2ccaefb72d1 100644 (file)
--- a/gtk/gtktogglebutton.c
+++ b/gtk/gtktogglebutton.c
@@ -308,7 +308,7 @@ gtk_toggle_button_set_active (GtkToggleButton *toggle_button,
 
   if (priv->active != is_active)
     {
-      gtk_button_clicked (GTK_BUTTON (toggle_button));
+      g_signal_emit_by_name (toggle_button, "clicked");
       g_object_notify_by_pspec (G_OBJECT (toggle_button), toggle_button_props[PROP_ACTIVE]);
     }
 }

diff --git a/gtk/gtktoggletoolbutton.c b/gtk/gtktoggletoolbutton.c
index eed4321fe10890a3436ec6d125849483068f553d..24ed46d3a3e85aba97b6848c8dba10613baf5e12 100644 (file)
--- a/gtk/gtktoggletoolbutton.c
+++ b/gtk/gtktoggletoolbutton.c
@@ -340,7 +340,7 @@ gtk_toggle_tool_button_set_active (GtkToggleToolButton *button,
 
   if (button->priv->active != is_active)
     {
-      gtk_button_clicked (GTK_BUTTON (_gtk_tool_button_get_button (GTK_TOOL_BUTTON (button))));
+      g_signal_emit_by_name (_gtk_tool_button_get_button (GTK_TOOL_BUTTON (button)), "clicked");
       g_object_notify (G_OBJECT (button), "active");
     }
 }

diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
index dca1aa288d7140c96a999a1cd3cceaf821ab5ec3..e63f0a6b0524e47f9804ab40dee4b0f901ca910c 100644 (file)
--- a/gtk/gtktoolbutton.c
+++ b/gtk/gtktoolbutton.c
@@ -727,6 +727,12 @@ clone_image_menu_size (GtkImage *image)
   return NULL;
 }
 
+static void
+click_button (GtkButton *button)
+{
+  g_signal_emit_by_name (button, "clicked");
+}
+
 static gboolean
 gtk_tool_button_create_menu_proxy (GtkToolItem *item)
 {
@@ -777,7 +783,7 @@ gtk_tool_button_create_menu_proxy (GtkToolItem *item)
 
   g_signal_connect_closure_by_id (menu_item,
                                  g_signal_lookup ("activate", G_OBJECT_TYPE (menu_item)), 0,
-                                 g_cclosure_new_object_swap (G_CALLBACK (gtk_button_clicked),
+                                 g_cclosure_new_object_swap (G_CALLBACK (click_button),
                                                              G_OBJECT (GTK_TOOL_BUTTON (button)->priv->button)),
                                  FALSE);
 

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 78e22c5ef2ffdc8af9f7c6dad95f2c1b6128fee2..6bba42a024ad81ed3fe9f7f342b37d6747e7e0f0 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -1087,7 +1087,7 @@ gtk_tree_view_column_mnemonic_activate (GtkWidget *widget,
   _gtk_tree_view_set_focus_column (GTK_TREE_VIEW (priv->tree_view), column);
 
   if (priv->clickable)
-    gtk_button_clicked (GTK_BUTTON (priv->button));
+     g_signal_emit_by_name (priv->button, "clicked");
   else if (gtk_widget_get_can_focus (priv->button))
     gtk_widget_grab_focus (priv->button);
   else
@@ -2244,9 +2244,8 @@ gtk_tree_view_column_clicked (GtkTreeViewColumn *tree_column)
 
   priv = tree_column->priv;
 
-  if (priv->visible &&
-      priv->clickable)
-    gtk_button_clicked (GTK_BUTTON (priv->button));
+  if (priv->visible && priv->clickable)
+    g_signal_emit_by_name (priv->button, "clicked");
 }
 
 /**